Avoid conflicts #76674
Closed
Avoid conflicts #76674
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
zephyrbot
added
area: UART
de-nordic
previously approved these changes
Aug 7, 2024
Contributor
de-nordic
left a comment
de-nordic
left a comment
There was a problem hiding this comment.
Flash part looks fine, thanks.
By sorting the lines alphabetically, conflicts can be reduced. Signed-off-by: Reto Schneider <[email protected]>
By sorting the lines alphabetically, conflicts can be reduced. Signed-off-by: Reto Schneider <[email protected]>
By sorting the lines alphabetically, conflicts can be reduced. Signed-off-by: Reto Schneider <[email protected]>
rettichschnidi
force-pushed
the
gardena/rs/upstream/sim3u-sort-lines
branch
from
84397f7 to
e34863c
Compare
This was referenced Oct 3, 2024
Contributor
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By sorting the lines alphabetically, conflicts can be reduced.
Background
For a while now, I am working on support for a new SoC. Often, when rebasing my WIP branch on the most recent main, conflicts happen because everyone adds new drivers at the bottom. By biting the bullet now, this kind of conflict can (most of the time) be avoided in the future.